Autogenerated HTML docs for v1.5.0-rc3-80-g35ce
diff --git a/git-blame.html b/git-blame.html index b10a5da..ebdf9b8 100644 --- a/git-blame.html +++ b/git-blame.html
@@ -274,7 +274,7 @@ <div class="sectionbody"> <div class="verseblock"> <div class="content"><em>git-blame</em> [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m] [-S <revs-file>] - [-M] [-C] [-C] [--since=<date>] [<rev>] [--] <file></div></div> + [-M] [-C] [-C] [--since=<date>] [<rev> | --contents <file>] [--] <file></div></div> </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> @@ -375,6 +375,18 @@ </p> </dd> <dt> +--contents <file> +</dt> +<dd> +<p> + When <rev> is not specified, the command annotates the + changes starting backwards from the working tree copy. + This flag makes the command pretend as if the working + tree copy has the contents of he named file (specify + <tt>-</tt> to make the command read from the standard input). +</p> +</dd> +<dt> -M </dt> <dd> @@ -583,7 +595,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 28-Jan-2007 20:55:10 UTC +Last updated 06-Feb-2007 00:09:23 UTC </div> </div> </body>
diff --git a/git-blame.txt b/git-blame.txt index 0ee887d..5c9888d 100644 --- a/git-blame.txt +++ b/git-blame.txt
@@ -9,7 +9,7 @@ -------- [verse] 'git-blame' [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m] [-S <revs-file>] - [-M] [-C] [-C] [--since=<date>] [<rev>] [--] <file> + [-M] [-C] [-C] [--since=<date>] [<rev> | --contents <file>] [--] <file> DESCRIPTION ----------- @@ -67,6 +67,13 @@ Show the result incrementally in a format designed for machine consumption. +--contents <file>:: + When <rev> is not specified, the command annotates the + changes starting backwards from the working tree copy. + This flag makes the command pretend as if the working + tree copy has the contents of he named file (specify + `-` to make the command read from the standard input). + -M:: Detect moving lines in the file as well. When a commit moves a block of lines in a file (e.g. the original file
diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index f84d404..84a16d0 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html
@@ -272,7 +272,7 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git-cvsexportcommit</em> [-h] [-v] [-c] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID</p> +<p><em>git-cvsexportcommit</em> [-h] [-v] [-c] [-P] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID</p> </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> @@ -326,6 +326,14 @@ </p> </dd> <dt> +-P +</dt> +<dd> +<p> + Force the parent commit, even if it is not a direct parent. +</p> +</dd> +<dt> -m </dt> <dd> @@ -386,7 +394,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-Jan-2007 00:37:16 UTC +Last updated 06-Feb-2007 00:09:24 UTC </div> </div> </body>
diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt index 347cbce..27d531b 100644 --- a/git-cvsexportcommit.txt +++ b/git-cvsexportcommit.txt
@@ -8,7 +8,7 @@ SYNOPSIS -------- -'git-cvsexportcommit' [-h] [-v] [-c] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID +'git-cvsexportcommit' [-h] [-v] [-c] [-P] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID DESCRIPTION @@ -46,6 +46,9 @@ -f:: Force the merge even if the files are not up to date. +-P:: + Force the parent commit, even if it is not a direct parent. + -m:: Prepend the commit message with the provided prefix. Useful for patch series and the like.
diff --git a/git-for-each-ref.html b/git-for-each-ref.html index 029b2c1..598c538 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html
@@ -359,7 +359,7 @@ </dt> <dd> <p> - The name of the ref (the part after $GIT_DIR/refs/). + The name of the ref (the part after $GIT_DIR/). </p> </dd> <dt> @@ -488,7 +488,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 29-Jan-2007 02:55:07 UTC +Last updated 06-Feb-2007 00:09:24 UTC </div> </div> </body>
diff --git a/git-for-each-ref.txt b/git-for-each-ref.txt index da52eba..f49b0d9 100644 --- a/git-for-each-ref.txt +++ b/git-for-each-ref.txt
@@ -66,7 +66,7 @@ For all objects, the following names can be used: refname:: - The name of the ref (the part after $GIT_DIR/refs/). + The name of the ref (the part after $GIT_DIR/). objecttype:: The type of the object (`blob`, `tree`, `commit`, `tag`).
diff --git a/git-rebase.html b/git-rebase.html index 46b55d3..5cd948b 100644 --- a/git-rebase.html +++ b/git-rebase.html
@@ -367,6 +367,25 @@ A---B---C---D master</tt></pre> </div></div> <p>This is useful when topicB does not depend on topicA.</p> +<p>A range of commits could also be removed with rebase. If we have +the following situation:</p> +<div class="listingblock"> +<div class="content"> +<pre><tt> E---F---G---H---I---J topicA</tt></pre> +</div></div> +<p>then the command</p> +<div class="literalblock"> +<div class="content"> +<pre><tt>git-rebase --onto topicA~5 topicA~2 topicA</tt></pre> +</div></div> +<p>would result in the removal of commits F and G:</p> +<div class="listingblock"> +<div class="content"> +<pre><tt> E---H'---I'---J' topicA</tt></pre> +</div></div> +<p>This is useful if F and G were flawed in some way, or should not be +part of topicA. Note that the argument to --onto and the <upstream> +parameter can be any valid commit-ish.</p> <p>In case of conflict, git-rebase will stop at the first problematic commit and leave conflict markers in the tree. You can use git diff to locate the markers (<<<<<<) and make edits to resolve the conflict. For each @@ -398,7 +417,8 @@ <p> Starting point at which to create the new commits. If the --onto option is not specified, the starting point is - <upstream>. + <upstream>. May be any valid commit, and not just an + existing branch name. </p> </dd> <dt> @@ -406,7 +426,8 @@ </dt> <dd> <p> - Upstream branch to compare against. + Upstream branch to compare against. May be any valid commit, + not just an existing branch name. </p> </dd> <dt> @@ -559,7 +580,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-Jan-2007 00:37:29 UTC +Last updated 06-Feb-2007 00:09:25 UTC </div> </div> </body>
diff --git a/git-rebase.txt b/git-rebase.txt index 0cb9e1f..977f661 100644 --- a/git-rebase.txt +++ b/git-rebase.txt
@@ -114,6 +114,27 @@ This is useful when topicB does not depend on topicA. +A range of commits could also be removed with rebase. If we have +the following situation: + +------------ + E---F---G---H---I---J topicA +------------ + +then the command + + git-rebase --onto topicA~5 topicA~2 topicA + +would result in the removal of commits F and G: + +------------ + E---H'---I'---J' topicA +------------ + +This is useful if F and G were flawed in some way, or should not be +part of topicA. Note that the argument to --onto and the <upstream> +parameter can be any valid commit-ish. + In case of conflict, git-rebase will stop at the first problematic commit and leave conflict markers in the tree. You can use git diff to locate the markers (<<<<<<) and make edits to resolve the conflict. For each @@ -141,10 +162,12 @@ <newbase>:: Starting point at which to create the new commits. If the --onto option is not specified, the starting point is - <upstream>. + <upstream>. May be any valid commit, and not just an + existing branch name. <upstream>:: - Upstream branch to compare against. + Upstream branch to compare against. May be any valid commit, + not just an existing branch name. <branch>:: Working branch; defaults to HEAD.
diff --git a/git-tools.html b/git-tools.html index 2eacea2..208c494 100644 --- a/git-tools.html +++ b/git-tools.html
@@ -387,6 +387,18 @@ series in git back and forth.</tt></pre> </div></div> </li> +<li> +<p> +<strong>hg-to-git</strong> (contrib/) +</p> +<div class="literalblock"> +<div class="content"> +<pre><tt>hg-to-git converts a Mercurial repository into a git one, and +preserves the full branch history in the process. hg-to-git can +also be used in an incremental way to keep the git repository +in sync with the master Mercurial repository.</tt></pre> +</div></div> +</li> </ul> </div> <h2>Others</h2> @@ -421,7 +433,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 17-Jan-2007 17:42:22 UTC +Last updated 06-Feb-2007 00:09:28 UTC </div> </div> </body>
diff --git a/git-tools.txt b/git-tools.txt index 6b407f9..10653ff 100644 --- a/git-tools.txt +++ b/git-tools.txt
@@ -86,6 +86,14 @@ series in git back and forth. + - *hg-to-git* (contrib/) + + hg-to-git converts a Mercurial repository into a git one, and + preserves the full branch history in the process. hg-to-git can + also be used in an incremental way to keep the git repository + in sync with the master Mercurial repository. + + Others ------
diff --git a/git.html b/git.html index 42e8a59..065f21a 100644 --- a/git.html +++ b/git.html
@@ -2288,7 +2288,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 05-Feb-2007 07:21:37 UTC +Last updated 06-Feb-2007 00:09:25 UTC </div> </div> </body>